nixos/rspamd: Fix enable for locals and overrides#49792
Merged
fpletz merged 1 commit intoNixOS:masterfrom Nov 6, 2018
Merged
Conversation
When implementing NixOS#49620 I included an enable option for both the locals and overrides options but the code writing the files didn't actually look at enable and so would write the file regardless of its value. I also set the type to loaOf which should have been attrsOf since the code was not written to handle the options being lists. This fixes both of those issues.
GrahamcOfBorg
added
6.topic: nixos
Member
|
@GrahamcOfBorg test rspamd.customLuaRules |
|
Success on x86_64-linux (full log) Attempted: tests.rspamd.customLuaRules Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: tests.rspamd.customLuaRules Partial log (click to expand)
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation for this change
When implementing #49620 I included an
enableoption for both thelocalsandoverridesoptions but the code writing the files didn'tactually look at
enableand so would write the file regardless of itsvalue. I also set the type to
loaOfwhich should have beenattrsOfsince the code was not written to handle the options being lists.
This fixes both of those issues.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)